bitkeeper revision 1.1159.187.34 (41ab39fcX9O7MQ23ZZswDbS6Tx80Sw)

Use uname -m instead of uname -i to get the build hosts architecture.

diff --git a/netbsd-2.0-xen-sparse/nbconfig-xen b/netbsd-2.0-xen-sparse/nbconfig-xen
index 2bd5a77cef5e25383c6eb4a63005c458b9644293..d6216614f877c7f635bc4c54882df559f7d243e6 100755 (executable)
--- a/netbsd-2.0-xen-sparse/nbconfig-xen
+++ b/netbsd-2.0-xen-sparse/nbconfig-xen
@@ -2,11 +2,17 @@
 #
 
 : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)}
-: ${HARCH:=$(uname -i 2>/dev/null || echo i386)}
+: ${HARCH:=$(uname -m 2>/dev/null || echo i386)}
 : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')}
 : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')}
 : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')}
 
+case "$HARCH" in
+i586|i686)
+  HARCH=i386
+  ;;
+esac
+
 TOOLDIR="$TOPDIR/../netbsd-${NETBSD_RELEASE}-tools/$HOS-$HARCH"; export TOOLDIR
 
 CONF="$1"

diff --git a/netbsd-2.0-xen-sparse/nbmake-xen b/netbsd-2.0-xen-sparse/nbmake-xen
index 685453890565bd4b52aa89e05c896dd76d1be56a..2648a4a39b2eb0b875e8b1ce83f8418731016519 100755 (executable)
--- a/netbsd-2.0-xen-sparse/nbmake-xen
+++ b/netbsd-2.0-xen-sparse/nbmake-xen
@@ -4,11 +4,17 @@
 #
 
 : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)}
-: ${HARCH:=$(uname -i 2>/dev/null || echo i386)}
+: ${HARCH:=$(uname -m 2>/dev/null || echo i386)}
 : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')}
 : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')}
 : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')}
 
+case "$HARCH" in
+i586|i686)
+  HARCH=i386
+  ;;
+esac
+
 NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR
 DESTDIR="$TOPDIR/root"; export DESTDIR
 unset MAKEOBJDIRPREFIX